From d653592943984e7d8db8460a67749f9362499243 Mon Sep 17 00:00:00 2001
From: molaboon <how88889@gmail.com>
Date: Sat, 3 Jul 2021 14:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=85=A5=E5=BE=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=9C=83=E5=88=AA=E9=99=A4=E7=99=BB=E5=85=A5=E7=95=AB?=
 =?UTF-8?q?=E9=9D=A2=20=E7=BE=8E=E8=A1=93=E5=84=AA=E5=8C=96=E5=8A=AA?=
 =?UTF-8?q?=E5=8A=9B=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 firstpage.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/firstpage.py b/firstpage.py
index d2cf0e0..86fb7a6 100644
--- a/firstpage.py
+++ b/firstpage.py
@@ -39,14 +39,20 @@ def loginwin(login):
     frame1=Frame(login,width=300,height=100,bg="lightgreen")
     frame2=Frame(login,width=300,height=100,bg="lightgreen")
     frame3=Frame(login,width=300,height=100,bg="lightgreen")
-
+    frame4=Frame(login,width=300,height=100,bg="lightgreen")
     prompt_lb=Label(frame,text="請輸入你的學號與密碼",font="Helvetica 20",bg="lightgreen")
     login_btn=Button(frame3,text="登入",command=lambda:Login() ) 
+    
     enter_name=Entry(frame1,bd=3)
     enter_password=Entry(frame2,show="*",bd=3)
+    enter_ncnupw=Entry(frame4,show="*",bd=3)
+    
     name_lb=Label(frame1,text="學號",font="Helvetica 12",bg="lightgreen")
-    pw_lb=Label(frame2,text="密碼",font="Helvetica 12",bg="lightgreen")
-    show_password=Button( frame3,text="透視密碼")
+    
+    pw_lb=Label(frame2,text="Moodle密碼",font="Helvetica 12",bg="lightgreen")
+    ncnupw_lb=Label(frame4,text="教務系統密碼",font="Helvetica 12",bg="lightgreen")
+    
+    show_password=Button( frame3,text="透視moodle密碼")
     show_password.bind( '<Button-1>',lambda event:enter_password.config(show=""))
     show_password.bind( '<ButtonRelease-1>',lambda event : enter_password.config(show="*") )
 
@@ -59,7 +65,7 @@ def loginwin(login):
             CON["moodle"]["username"]=str(enter_name.get() )          
             CON["moodle"]["password"]=str(enter_password.get())
             CON["NCNU"]["username"]=str(enter_name.get())
-            CON["NCNU"]["password"]=str(enter_password.get())
+            CON["NCNU"]["password"]=str(enter_ncnupw.get())
 
         json.dump(CON, open("config.json", "w"))
         try:
@@ -70,19 +76,23 @@ def loginwin(login):
         except:
             messagebox.showinfo(message="Error") 
         else:
-            login.destroy
+            login.destroy()
             mainWin=Tk() 
             createMainWin(mainWin,ncnu,moodle)      
 
     frame.pack()
     frame1.pack()
     frame2.pack()
+    frame4.pack()
     frame3.pack() 
     prompt_lb.pack(pady=10,side="top")
     name_lb.pack(side="left")
     enter_name.pack(side="left")
     pw_lb.pack(side="left")
     enter_password.pack(side="left")
+    ncnupw_lb.pack(side="left")
+    enter_ncnupw.pack()
+    
     show_password.pack(side="left",pady=10,padx=10)
     login_btn.pack(side="left",pady=10)