Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dai make css local #23

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea/
44 changes: 22 additions & 22 deletions Connect.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?php

$servername = "localhost";
$username = "root";
$password = "";


// $servername = "sql202.epizy.com";
// $username = "epiz_23626301";
// $password = "wtn2rmj3";
// Create connection
$con = new mysqli($servername, $username, $password,'lrr');

// Check connection
if ($con->connect_error) {
die("Database Connection failed: " . $conn->connect_error);
}
// else
// {

// echo "Connected";
// }
session_start();
//
//$servername = "localhost";
//$username = "root";
//$password = "";
//
//
//// $servername = "sql202.epizy.com";
//// $username = "epiz_23626301";
//// $password = "wtn2rmj3";
//// Create connection
//$con = new mysqli($servername, $username, $password,'lrr');
//
//// Check connection
//if ($con->connect_error) {
// die("Database Connection failed: " . $conn->connect_error);
//}
//// else
//// {
//
//// echo "Connected";
//// }
//session_start();
Comment on lines +2 to +23
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dzr201732120115

Why comment out these?

If I merge these changes, then it would break the current build.

Hui

5 changes: 3 additions & 2 deletions Header.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@
<header>


<link href="css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
<link href="http://118.25.96.118/nor/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dzr201732120115

Why add "http://118.25.96.118/nor/"? I think this would not make any difference.

Hui


<!--<link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/> -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/fontawesome.min.css" />
<!--<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/fontawesome.min.css" />-->
<link rel="stylesheet" href="./webfonts/all.min.css" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dzr201732120115

You created a new folder called webfonts?

Is all.min.css the same as fontawesome.min.css ?

Hui

<script src="http://118.25.96.118/nor/css/jquery.min.js" type="text/javascript"></script>
<script src="http://118.25.96.118/nor/css/bootsrap.min.js" type="text/javascript"></script>
<link href="http://118.25.96.118/nor/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
Expand Down
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ while he was taking a graduate course called **Advanced Software Engineering** (

The LRR's project home page is at http://118.25.96.118/nor/homepage/index.html.

### If you want to get the local deployment version, clone the following

`git clone https://github.com/dzr201732120115/LRR.git`

# Mission

Expand Down Expand Up @@ -129,6 +131,20 @@ Check FAQ.md (TBA) for details.
The original GitHub Repo is at https://github.com/EngMohamedNor/LabReportRepo


### Steps of local test deployment
1.download **xampp** <br>
2.follow the website to do:
> https://blog.csdn.net/qing666888/article/details/81914389 <br>
Copy link
Member

@spm2020spring spm2020spring Apr 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dzr201732120115

Why do you append <br> in the end of sentence?

Hui


**note:** don't change mysql's **port** and don't set its **password** <br>
3.put LRR file in .\xampp\htdocs\LRR <br>
4.run http://localhost:8081/ (if you change apache's port from 80 to 8081),login phpMyAdmin <br>
5.create database lrr in phpMyAdmin and import lrr(1).sql (or lrr_database.sql). <br>
6.ensure apache and xampp server is running on Xampp-control,
run http://localhost:8081/LRR/script.php first,then run http://localhost:8081/LRR/index.php. <br>
7.use account and password in phpMyAdmin's lrr.users_table to login. <br>
8.begin your test

# Contributor List


Expand Down Expand Up @@ -164,3 +180,5 @@ GuedaliaBonheurSPM - Guedalia Youma - 201925800221
ACorneille - Alimasi Corneille - 201925800168

Tabithakipanga - Kipanga Dorcas - 201925800170

Daizerong - 201732120115
4 changes: 2 additions & 2 deletions Script.php
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@
header("Location: Admin.php");

} else {
echo "Error: " . $sql . "<br>" . $conn->error;
echo "Error: " . $sql . "<br>" . $con->error;
Copy link
Member

@spm2020spring spm2020spring Apr 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dzr201732120115

Why did you change conn to con?

Hui

}
}

Expand Down Expand Up @@ -641,7 +641,7 @@ function Create_dir($upPath)
header("Location: Courses.php?course=".$url);

} else {
echo "Error: " . $sql . "<br>" . $conn->error;
echo "Error: " . $sql . "<br>" . $con->error;
}
}

Expand Down
134 changes: 0 additions & 134 deletions homepage/Overview.html

This file was deleted.

5 changes: 5 additions & 0 deletions webfonts/all.min.css

Large diffs are not rendered by default.

Binary file added webfonts/fa-solid-900.eot
Binary file not shown.
Binary file added webfonts/fa-solid-900.ttf
Binary file not shown.
Binary file added webfonts/fa-solid-900.woff2
Binary file not shown.