Conversation
|
@dzr201732120115 Make a smaller pull request next time. Make many pull requests if you have many updates. Hui |
| // | ||
| //$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(); No newline at end of file |
There was a problem hiding this comment.
@dzr201732120115
Why comment out these?
If I merge these changes, then it would break the current build.
Hui
|
|
||
|
|
||
| <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"/> |
There was a problem hiding this comment.
@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" /> |
There was a problem hiding this comment.
@dzr201732120115
You created a new folder called webfonts?
Is all.min.css the same as fontawesome.min.css ?
Hui
| ### Steps of local test deployment | ||
| 1.download **xampp** <br> | ||
| 2.follow the website to do: | ||
| > https://blog.csdn.net/qing666888/article/details/81914389 <br> |
There was a problem hiding this comment.
@dzr201732120115
Why do you append <br> in the end of sentence?
Hui
|
对,而且那三个字体文件是all. min. css里面相对地址引用的,所以才必须一起下下来------------------ 原始邮件 ------------------
发件人: "Software Project Management"<notifications@github.com>
发送时间: 2020年4月13日(星期一) 晚上6:20
收件人: "lanlab-org/LRR"<LRR@noreply.github.com>;
抄送: "dzr201732120115"<975336710@qq.com>;"Mention"<mention@noreply.github.com>;
主题: Re: [lanlab-org/LRR] Dai make css local (#23)
@spm2020spring commented on this pull request.
In Header.php:
<!--<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" />
@dzr201732120115
You created a new folder called webfonts?
Is all.min.css the same as fontawesome.min.css ?
Hui
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
|
|
||
| } else { | ||
| echo "Error: " . $sql . "<br>" . $conn->error; | ||
| echo "Error: " . $sql . "<br>" . $con->error; |
There was a problem hiding this comment.
@dzr201732120115
Why did you change conn to con?
Hui
|
对于clone并测试的人来说差别很大,他们无法找到这个相对地址。而且下面也是加上的,这一个不加不伦不类。------------------ 原始邮件 ------------------
发件人: "Software Project Management"<notifications@github.com>
发送时间: 2020年4月13日(星期一) 晚上6:19
收件人: "lanlab-org/LRR"<LRR@noreply.github.com>;
抄送: "dzr201732120115"<975336710@qq.com>;"Mention"<mention@noreply.github.com>;
主题: Re: [lanlab-org/LRR] Dai make css local (#23)
@spm2020spring commented on this pull request.
In Header.php:
@@ -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"/>
@dzr201732120115
Why add "http://118.25.96.118/nor/"? I think this would not make any difference.
Hui
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
|
好的,之前不知道------------------ 原始邮件 ------------------
发件人: "Software Project Management"<notifications@github.com>
发送时间: 2020年4月13日(星期一) 晚上6:16
收件人: "lanlab-org/LRR"<LRR@noreply.github.com>;
抄送: "dzr201732120115"<975336710@qq.com>;"Mention"<mention@noreply.github.com>;
主题: Re: [lanlab-org/LRR] Dai make css local (#23)
@dzr201732120115
Make a smaller pull request next time.
Make many pull requests if you have many updates.
Hui
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
|
因为我中间插了个相对引用 > 它会打断排序使序号重新变成1,所以只能通过br换行确保序号的顺序------------------ 原始邮件 ------------------
发件人: "Software Project Management"<notifications@github.com>
发送时间: 2020年4月13日(星期一) 晚上6:23
收件人: "lanlab-org/LRR"<LRR@noreply.github.com>;
抄送: "dzr201732120115"<975336710@qq.com>;"Mention"<mention@noreply.github.com>;
主题: Re: [lanlab-org/LRR] Dai make css local (#23)
@spm2020spring commented on this pull request.
In README.md:
@@ -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>
@dzr201732120115
Why do you append <br> in the end of sentence?
Hui
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
|
conn报错,上面声明的也是con,没有conn,报错了总不能是故意的吧------------------ 原始邮件 ------------------
发件人: "Software Project Management"<notifications@github.com>
发送时间: 2020年4月13日(星期一) 晚上6:24
收件人: "lanlab-org/LRR"<LRR@noreply.github.com>;
抄送: "dzr201732120115"<975336710@qq.com>;"Mention"<mention@noreply.github.com>;
主题: Re: [lanlab-org/LRR] Dai make css local (#23)
@spm2020spring commented on this pull request.
In Script.php:
@@ -396,7 +396,7 @@ header("Location: Admin.php"); } else { - echo "Error: " . conn->error; + echo "Error: " . con->error;
@dzr201732120115
What did you change conn to con?
Hui
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
|
顺便问下老师,开始我都在commit里详细解释了,不过clone错网站了,重新提交了一遍觉得commit应该简短,所以commit应该说明干了什么还是要顺便解释下,或者在pull request里解释。------------------ 原始邮件 ------------------
发件人: "Software Project Management"<notifications@github.com>
发送时间: 2020年4月13日(星期一) 晚上6:24
收件人: "lanlab-org/LRR"<LRR@noreply.github.com>;
抄送: "dzr201732120115"<975336710@qq.com>;"Mention"<mention@noreply.github.com>;
主题: Re: [lanlab-org/LRR] Dai make css local (#23)
@spm2020spring commented on this pull request.
In Script.php:
@@ -396,7 +396,7 @@ header("Location: Admin.php"); } else { - echo "Error: " . conn->error; + echo "Error: " . con->error;
@dzr201732120115
Why did you change conn to con?
Hui
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
|
这个网站可以打开的,命名好像是那个issue里面说用这个名字还是啥原因反正是一样的,然后因为它内部相对引用了那三个字体所以下载下来,然后在测试里面console也没有报错,效果也一样------------------ 原始邮件 ------------------
发件人: "Software Project Management"<notifications@github.com>
发送时间: 2020年4月13日(星期一) 晚上6:20
收件人: "lanlab-org/LRR"<LRR@noreply.github.com>;
抄送: "dzr201732120115"<975336710@qq.com>;"Mention"<mention@noreply.github.com>;
主题: Re: [lanlab-org/LRR] Dai make css local (#23)
@spm2020spring commented on this pull request.
In Header.php:
<!--<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" />
@dzr201732120115
You created a new folder called webfonts?
Is all.min.css the same as fontawesome.min.css ?
Hui
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
spm2020spring
left a comment
There was a problem hiding this comment.
@dzr201732120115
Could you make another branch called Dai-MakeCssLocal2? Make sure this branch has exactly the same content as the central master repo (https://github.com/lanlab-org/LRR).
In this branch Dai-MakeCssLocal2, could you replace href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/all.min.css" with href="./font-awesome/css/all.min.css" on line 33 of Header.php?
Make sure you put all.min.css in the folder font-awesome/css.
Just make this single change and push Dai-MakeCssLocal2.
Thanks
Hui
@dzr201732120115 下面这个链接虽然能够打开,但是会导致我登录LRR时加载课程列表变慢很多(体验不好),因为LRR要首先到 https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/fontawesome.min.css 蓝珲 |
|
其实我本来也是想把它放在css文件里,但是因为那个相对引用是all.min.css文件里的,具体是.. /fo-solid,也就是说fa-solid要在all. min. css文件的上一级目录文件内能找到,如果把它放在css/all.min.css,那么它的上一级目录css/下就找不到fo-solid------------------ 原始邮件 ------------------
发件人: "Software Project Management"<notifications@github.com>
发送时间: 2020年4月13日(星期一) 晚上6:43
收件人: "lanlab-org/LRR"<LRR@noreply.github.com>;
抄送: "dzr201732120115"<975336710@qq.com>;"Mention"<mention@noreply.github.com>;
主题: Re: [lanlab-org/LRR] Dai make css local (#23)
@spm2020spring commented on this pull request.
@dzr201732120115
Could you make another branch called Dai-MakeCssLocal2? Make sure this branch has exactly the same content as the central master repo (https://github.com/lanlab-org/LRR).
In this branch Dai-MakeCssLocal2, could you replace href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/all.min.css" with href="./font-awesome/css/all.min.css" on line 33 of Header.php?
Make sure you put all.min.css in the folder font-awesome/css.
Just make this single change and push Dai-MakeCssLocal2.
Thanks
Hui
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
@dzr201732120115 你克隆下来的版本中Script.php有conn吗?可能你克隆的版本不对啊。你看下面的链接,lanlab-org下面的LRR是没有conn的。 https://github.com/lanlab-org/LRR/blob/Ashly-Tafadzwa-Dhani-201632120150-Contributor_List/Script.php |
|
应该不是克隆错了,直接点邮箱地址进去的,如果我clone错地址他不会让我提交的,总共两个conn其他都是con,回去我用搜索看看,截个图,现在在外面手机不方便------------------ 原始邮件 ------------------
发件人: "Software Project Management"<notifications@github.com>
发送时间: 2020年4月13日(星期一) 晚上6:55
收件人: "lanlab-org/LRR"<LRR@noreply.github.com>;
抄送: "dzr201732120115"<975336710@qq.com>;"Mention"<mention@noreply.github.com>;
主题: Re: [lanlab-org/LRR] Dai make css local (#23)
conn报错,上面声明的也是con,没有conn,报错了总不能是故意的吧------------------ 原始邮件 ------------------ 发件人: "Software Project Management"notifications@github.com 发送时间: 2020年4月13日(星期一) 晚上6:24 收件人: "lanlab-org/LRR"LRR@noreply.github.com; 抄送: "dzr201732120115"975336710@qq.com;"Mention"mention@noreply.github.com; 主题: Re: [lanlab-org/LRR] Dai make css local (#23) @spm2020spring commented on this pull request. In Script.php: @@ -396,7 +396,7 @@ header("Location: Admin.php"); } else { - echo "Error: " . conn->error; + echo "Error: " . con->error; @dzr201732120115 What did you change conn to con? Hui — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or unsubscribe.
你克隆下来的版本种Script.php有conn吗?可能你克隆的版本不对啊。你看下面的链接,lanlab-org下面的LRR是没有conn的。
https://github.com/lanlab-org/LRR/blob/Ashly-Tafadzwa-Dhani-201632120150-Contributor_List/Script.php
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
|
@dzr201732120115 FYI 现在运行LRR的网站上,有font-awesome文件夹,它的结构如下。因为是第三方的库,我们的仓库没有必要放它。
蓝珲
@dzr201732120115 FYI 现在运行LRR的网站上,有font-awesome文件夹,它的结构如下。因为是第三方的库,我们的仓库没有必要放它。
蓝珲 |
|
第399行和第625行的con打错了
…------------------ 原始邮件 ------------------
发件人: "Software Project Management"<notifications@github.com>;
发送时间: 2020年4月13日(星期一) 晚上6:55
收件人: "lanlab-org/LRR"<LRR@noreply.github.com>;
抄送: "975336710"<975336710@qq.com>; "Mention"<mention@noreply.github.com>;
主题: Re: [lanlab-org/LRR] Dai make css local (#23)
conn报错,上面声明的也是con,没有conn,报错了总不能是故意的吧------------------ 原始邮件 ------------------ 发件人: "Software Project Management"notifications@github.com 发送时间: 2020年4月13日(星期一) 晚上6:24 收件人: "lanlab-org/LRR"LRR@noreply.github.com; 抄送: "dzr201732120115"975336710@qq.com;"Mention"mention@noreply.github.com; 主题: Re: [lanlab-org/LRR] Dai make css local (#23) @spm2020spring commented on this pull request. In Script.php: @@ -396,7 +396,7 @@ header("Location: Admin.php"); } else { - echo "Error: " . conn->error; + echo "Error: " . con->error; @dzr201732120115 What did you change conn to con? Hui — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or unsubscribe.
你克隆下来的版本种Script.php有conn吗?可能你克隆的版本不对啊。你看下面的链接,lanlab-org下面的LRR是没有conn的。
https://github.com/lanlab-org/LRR/blob/Ashly-Tafadzwa-Dhani-201632120150-Contributor_List/Script.php
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
|
因为按照Ashly的说法,这个是应该注释掉的,而且连接应该用Script.php,去研究它的代码也会发现这是用于本地连接而不是远程的
所以对于部署的版本,直接用script.php就可以,本地版也可以把script.php的servername改成localhost或者重新启用,connect.php,另外这个文件里也打错了一个conn
…------------------ 原始邮件 ------------------
发件人: "Software Project Management"<notifications@github.com>;
发送时间: 2020年4月13日(星期一) 晚上6:18
收件人: "lanlab-org/LRR"<LRR@noreply.github.com>;
抄送: "975336710"<975336710@qq.com>;"Mention"<mention@noreply.github.com>;
主题: Re: [lanlab-org/LRR] Dai make css local (#23)
@spm2020spring commented on this pull request.
In Connect.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();
@dzr201732120115
Why comment out these?
If I merge these changes, then it would break the current build.
Hui
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
|
我好像添加错网站了,all.min.css 包含所有的字体,所以它依旧可以运行,我将重新发起pull request,这样您可以依个选择想要合并的修改,并且
我将在pull request中做好解释。
我将取消connect.php的注释,只是修改conn->con,同script.php。
并将fontawesome.min.css 放入'./font-awesome/css/fontawesome.min.css ',如您所愿,
取消 README.md 文件中 <br>的使用,为了一个'>'添加这么多br属实不明智
另外说明一下,原分支的LRR克隆下来存在路径冲突问题,存在两个一模一样但是名字不一样的 homepage/overview.html以及homepage/Overview.html,他们产生了冲突,一次只显示一个,我将移除一个并发起pull request,这不会影响到网站并改善了其他人clone的体验。
…------------------ 原始邮件 ------------------
发件人: "Software Project Management"<notifications@github.com>;
发送时间: 2020年4月13日(星期一) 晚上7:07
收件人: "lanlab-org/LRR"<LRR@noreply.github.com>;
抄送: "975336710"<975336710@qq.com>;"Mention"<mention@noreply.github.com>;
主题: Re: [lanlab-org/LRR] Dai make css local (#23)
@dzr201732120115
FYI
现在运行LRR的网站上,有font-awesome文件夹,它的结构如下。因为是第三方的库,我们的仓库没有必要放它。
font-awesome/less/fixed-width.less font-awesome/less/larger.less font-awesome/less/rotated-flipped.less font-awesome/less/font-awesome.less font-awesome/less/path.less font-awesome/less/list.less font-awesome/less/variables.less font-awesome/less/icons.less font-awesome/less/core.less font-awesome/less/bordered-pulled.less font-awesome/less/spinning.less font-awesome/less/stacked.less font-awesome/less/mixins.less font-awesome/less font-awesome/css/font-awesome.css font-awesome/css/font-awesome.min.css font-awesome/css font-awesome/fonts/fontawesome-webfont.woff font-awesome/fonts/fontawesome-webfont.ttf font-awesome/fonts/fontawesome-webfont.eot font-awesome/fonts/FontAwesome.otf font-awesome/fonts/fontawesome-webfont.svg font-awesome/fonts font-awesome/scss/_core.scss font-awesome/scss/_fixed-width.scss font-awesome/scss/_rotated-flipped.scss font-awesome/scss/_bordered-pulled.scss font-awesome/scss/_mixins.scss font-awesome/scss/font-awesome.scss font-awesome/scss/_list.scss font-awesome/scss/_variables.scss font-awesome/scss/_stacked.scss font-awesome/scss/_spinning.scss font-awesome/scss/_path.scss font-awesome/scss/_larger.scss font-awesome/scss/_icons.scss font-awesome/scss
蓝珲
其实我本来也是想把它放在css文件里,但是因为那个相对引用是all.min.css文件里的,具体是.. /fo-solid,也就是说fa-solid要在all. min. css文件的上一级目录文件内能找到,如果把它放在css/all.min.css,那么它的上一级目录css/下就找不到fo-solid------------------ 原始邮件 ------------------ 发件人: "Software Project Management"notifications@github.com 发送时间: 2020年4月13日(星期一) 晚上6:43 收件人: "lanlab-org/LRR"LRR@noreply.github.com; 抄送: "dzr201732120115"975336710@qq.com;"Mention"mention@noreply.github.com; 主题: Re: [lanlab-org/LRR] Dai make css local (#23) @spm2020spring commented on this pull request. @dzr201732120115 Could you make another branch called Dai-MakeCssLocal2? Make sure this branch has exactly the same content as the central master repo (https://github.com/lanlab-org/LRR). In this branch Dai-MakeCssLocal2, could you replace href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.8.2/css/all.min.css" with href="./font-awesome/css/all.min.css" on line 33 of Header.php? Make sure you put all.min.css in the folder font-awesome/css. Just make this single change and push Dai-MakeCssLocal2. Thanks Hui — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or unsubscribe.
@dzr201732120115
FYI
现在运行LRR的网站上,有font-awesome文件夹,它的结构如下。因为是第三方的库,我们的仓库没有必要放它。
font-awesome/less/fixed-width.less font-awesome/less/larger.less font-awesome/less/rotated-flipped.less font-awesome/less/font-awesome.less font-awesome/less/path.less font-awesome/less/list.less font-awesome/less/variables.less font-awesome/less/icons.less font-awesome/less/core.less font-awesome/less/bordered-pulled.less font-awesome/less/spinning.less font-awesome/less/stacked.less font-awesome/less/mixins.less font-awesome/less font-awesome/css/font-awesome.css font-awesome/css/font-awesome.min.css font-awesome/css font-awesome/fonts/fontawesome-webfont.woff font-awesome/fonts/fontawesome-webfont.ttf font-awesome/fonts/fontawesome-webfont.eot font-awesome/fonts/FontAwesome.otf font-awesome/fonts/fontawesome-webfont.svg font-awesome/fonts font-awesome/scss/_core.scss font-awesome/scss/_fixed-width.scss font-awesome/scss/_rotated-flipped.scss font-awesome/scss/_bordered-pulled.scss font-awesome/scss/_mixins.scss font-awesome/scss/font-awesome.scss font-awesome/scss/_list.scss font-awesome/scss/_variables.scss font-awesome/scss/_stacked.scss font-awesome/scss/_spinning.scss font-awesome/scss/_path.scss font-awesome/scss/_larger.scss font-awesome/scss/_icons.scss font-awesome/scss
蓝珲
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
戴泽荣 201732120115 make css file localization