Hugging Face's logo

Spaces:
Justtalk
/
JusTalk
Running

App Files Community
3
buletomato25 commited on
Commit
3ceca0e
·
1 Parent(s): fbc9cec

login_complete

Browse files
Files changed (5) hide show
  1. app.py +2 -22
  2. templates/feedback.html +23 -6
  3. templates/history.html +5 -0
  4. templates/index.html +1 -2
  5. users.py +0 -17
app.py CHANGED
@@ -10,9 +10,6 @@ from datetime import datetime, timedelta
10
  from pyannote.audio import Model, Inference
11
  from pydub import AudioSegment
12
  from flask_sqlalchemy import SQLAlchemy
13
- from flask_login import LoginManager, UserMixin, login_user, logout_user, login_required
14
- from users import Users
15
- from werkzeug.security import generate_password_hash, check_password_hash
16
  from dotenv import load_dotenv
17
  from google.oauth2 import id_token
18
  from google_auth_oauthlib.flow import Flow
@@ -49,23 +46,6 @@ flow = Flow.from_client_secrets_file(
49
  redirect_uri=REDIRECT_URI
50
  )
51
 
52
- """
53
- # データベース設定
54
- app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///site.db'
55
- app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
56
-
57
- # db を Flask アプリに紐づける
58
- db.init_app(app)
59
-
60
- # Flask-Login の設定
61
- login_manager = LoginManager()
62
- login_manager.init_app(app)
63
- login_manager.login_view = "login"
64
- """
65
- @login_manager.user_loader
66
- def load_user(user_id):
67
- return Users.query.get(int(user_id))
68
-
69
  def cosine_similarity(vec1, vec2):
70
  vec1 = vec1 / np.linalg.norm(vec1)
71
  vec2 = vec2 / np.linalg.norm(vec2)
@@ -165,7 +145,7 @@ def feedback():
165
  'name': session.get('name'),
166
  'email': session.get('email')
167
  }
168
- return render_template('feedback.html', users=users)
169
 
170
  # 会話詳細画面（テンプレート: talkDetail.html）
171
  @app.route('/talk_detail', methods=['GET', 'POST'])
@@ -176,7 +156,7 @@ def talk_detail():
176
  'name': session.get('name'),
177
  'email': session.get('email')
178
  }
179
- return render_template('talkDetail.html', users=users)
180
 
181
  # ログイン画面（テンプレート: login.html）
182
  @app.route('/login')
 
10
  from pyannote.audio import Model, Inference
11
  from pydub import AudioSegment
12
  from flask_sqlalchemy import SQLAlchemy
 
 
 
13
  from dotenv import load_dotenv
14
  from google.oauth2 import id_token
15
  from google_auth_oauthlib.flow import Flow
 
46
  redirect_uri=REDIRECT_URI
47
  )
48
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
49
  def cosine_similarity(vec1, vec2):
50
  vec1 = vec1 / np.linalg.norm(vec1)
51
  vec2 = vec2 / np.linalg.norm(vec2)
 
145
  'name': session.get('name'),
146
  'email': session.get('email')
147
  }
148
+ return render_template('feedback.html')
149
 
150
  # 会話詳細画面（テンプレート: talkDetail.html）
151
  @app.route('/talk_detail', methods=['GET', 'POST'])
 
156
  'name': session.get('name'),
157
  'email': session.get('email')
158
  }
159
+ return render_template('talkDetail.html')
160
 
161
  # ログイン画面（テンプレート: login.html）
162
  @app.route('/login')
templates/feedback.html CHANGED
@@ -4,6 +4,10 @@
4
  <meta charset="UTF-8" />
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
6
  <title>会話フィードバック画面</title>
 
 
 
 
7
  <style>
8
  body {
9
  font-family: Arial, sans-serif;
@@ -101,16 +105,17 @@
101
  }
102
  };
103
  function showRecorder() {
104
- // 録音画面へ遷移
105
- window.location.href = 'index';
106
  }
107
  function showTalkDetil() {
108
- // 会話詳細へ遷移
109
- window.location.href = 'talk_detail';
110
  }
111
  </script>
112
  </head>
113
  <body>
 
114
  <div class="card">
115
  <div class="level" id="level">話者Lv: 85</div>
116
  <div class="message" id="message">素晴らしい</div>
@@ -158,8 +163,20 @@
158
  />
159
  </div>
160
  </form>-->
161
- <button class="history-button" id="detailButton" onclick="showRecorder()">録音画面を表示</button>
162
- <button class="history-button" id="detailButton" onclick="showTalkDetil()">会話詳細を表示</button>
 
 
 
 
 
 
 
 
 
 
 
 
163
  <!--<form method="POST" action="/talk_detail">
164
  <div class="feedback-space">
165
  <input
 
4
  <meta charset="UTF-8" />
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
6
  <title>会話フィードバック画面</title>
7
+ <link
8
+ href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
9
+ rel="stylesheet"
10
+ />
11
  <style>
12
  body {
13
  font-family: Arial, sans-serif;
 
105
  }
106
  };
107
  function showRecorder() {
108
+ // 録音画面へ遷移
109
+ window.location.href = "index";
110
  }
111
  function showTalkDetil() {
112
+ // 会話詳細へ遷移
113
+ window.location.href = "talk_detail";
114
  }
115
  </script>
116
  </head>
117
  <body>
118
+ <h1 class="mb-4">ようこそ, {{ user.name }} さん!</h1>
119
  <div class="card">
120
  <div class="level" id="level">話者Lv: 85</div>
121
  <div class="message" id="message">素晴らしい</div>
 
163
  />
164
  </div>
165
  </form>-->
166
+ <button
167
+ class="history-button"
168
+ id="detailButton"
169
+ onclick="showRecorder()"
170
+ >
171
+ 録音画面を表示
172
+ </button>
173
+ <button
174
+ class="history-button"
175
+ id="detailButton"
176
+ onclick="showTalkDetil()"
177
+ >
178
+ 会話詳細を表示
179
+ </button>
180
  <!--<form method="POST" action="/talk_detail">
181
  <div class="feedback-space">
182
  <input
templates/history.html CHANGED
@@ -4,6 +4,10 @@
4
  <meta charset="UTF-8" />
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
6
  <title>会話履歴</title>
 
 
 
 
7
  <style>
8
  body {
9
  margin: 0;
@@ -105,6 +109,7 @@
105
  </head>
106
  <body>
107
  <header>All Recordings</header>
 
108
  <div class="recording-list">
109
  <div class="record-item record-item-template">
110
  <div>
 
4
  <meta charset="UTF-8" />
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
6
  <title>会話履歴</title>
7
+ <link
8
+ href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
9
+ rel="stylesheet"
10
+ />
11
  <style>
12
  body {
13
  margin: 0;
 
109
  </head>
110
  <body>
111
  <header>All Recordings</header>
112
+ <h1>ようこそ, {{ user.name }} さん!</h1>
113
  <div class="recording-list">
114
  <div class="record-item record-item-template">
115
  <div>
templates/index.html CHANGED
@@ -344,8 +344,7 @@
344
  }
345
 
346
  function showHistory() {
347
- // 会話履歴表示の画面があれば、そのページへ遷移する例
348
- // window.location.href = 'history';
349
  alert("会話履歴を表示する機能は未実装です。");
350
  }
351
 
 
344
  }
345
 
346
  function showHistory() {
347
+ window.location.href = "history";
 
348
  alert("会話履歴を表示する機能は未実装です。");
349
  }
350
 
users.py DELETED
@@ -1,17 +0,0 @@
1
-
2
- from flask_login import UserMixin
3
- from database import db
4
-
5
- class Users(UserMixin, db.Model):
6
- '''
7
- Users Table Model
8
- '''
9
- __tablename__ = 'users'
10
- id = db.Column(db.Integer, primary_key=True)
11
- username = db.Column(db.String(255), nullable=False, unique=True)
12
- password = db.Column(db.String(255))
13
-
14
- def __init__(self,username,password):
15
- self.username = username
16
- self.password = password
17
-