Skip to content

Commit aea3d25

Browse files
committed
debug empty table generation, update credentials
1 parent 8bf5350 commit aea3d25

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

HwProj.APIGateway/HwProj.APIGateway.API/TableGenerators/ExcelGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static ExcelPackage Generate(
7070
++position.Column;
7171

7272
AddHomeworksHeaders(worksheet, course, position, rowsNumber, SeparationColumnWidth);
73-
var columnsNumber = position.Column - 2;
73+
var columnsNumber = position.Column - 1;
7474
position.ToNextRow(2);
7575

7676
worksheet.Cells[1, 1, rowsNumber, columnsNumber].Style.Font.Size = FontSize;

hwproj.front/.env

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
# Переменные, необходимые для локального запуска в режиме разработки (npm run dev)
22
VITE_BASE_PATH=http://localhost:5000
33
VITE_YANDEX_METRICA_ID=101061418
4+
VITE_YANDEX_APPLICATION_NAME=hwproj-spreadsheets-dev
5+
VITE_YANDEX_CLIENT_ID=8545882a5f454277b0e32678e29a44d6
6+
VITE_YANDEX_CLIENT_SECRET=cba6bdaa445e47ad912786cbd36cc36b
7+
VITE_YANDEX_AUTHORIZATION_TOKEN=y0__xCEp86vBhi0wDcgndnNgBMU-uahzwhSdazLYTCyz0Xx5DWHKA
48
WDS_SOCKET_PORT=0
5-
GOOGLE_SHEETS_PROJECT_ID=trim-technique-365200
6-
GOOGLE_SHEETS_PRIVATE_KEY='-----BEGIN PRIVATE KEY-----\nMIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCmukqMYeN3fUNy\n5L/Wx+DWcE09TJ98CD+ixXKf+BjLpks4He8P5PUhP2UyRcbKSE0mZzx4XbNcfKPX\ndEpy5gi12dYo6ZXHvEeiExq6nxmWKKRJ6zS/52wp8VfXRxdn0zuf01WtlyjzFkMu\nS1arADHZXSeGeBe0HTN73Tt53SnmgPqtT85mPnLi63hk4Vh+HeQQiU/BpEFVOyO8\nDLHwbxfrxiqbqRvD5YLnd63UCXJSIep7qLD/x0eU0hdNQpmIiqFTi4CIqbtFc2KL\n4Bdlg9a9r+YoqfBjzelVvTx9JtIllpullZngzrtOjQRYOZSjIVp78iy1ilt4rApm\n5KdBVHwlAgMBAAECggEAAJAX8NXiw/RBDkn96M53cJnj9N1Fm5BWkKjcfHREtylK\nTzfwpuvVtQVHBO6t32BznDnUfy6HzLvh/Lf4iV9D78M6wRwaxJga4M3yNOeVGUft\nWA+Kd8xi9dhJ/ODRUCkrJhy7SRD90yZD10vrULv5LxvspnxQziucESK70OtBeTT8\nXgycC4El5IfQreYuKg3zcDlxw7tayO4OpURfUcRnVDrlMAUhDrm37PGtbg5tBUsN\n0sxpIz76bj6pRBrVHyAc0eCmCJXOpx/+IlJ6wGxX/eMWR8Akgg4JJ/iLUBXkICzy\n/IymiAGPlij9F0kC4mx11L9WWoF4oajnBvt5S2FS6QKBgQDZ63uiC25YF6+XjW6n\nZpxffH8Q9d1hn5xB7wBQBB/PjQL6mty+bYPDjFJWEa0qlMxtscrF9RJ2Km4sIS4t\nOrhhdJjSfcpNfp70F89gn24S4xpGqt1iGVeaxXxCfl5g6MhMkUEGSEgEJ6KEWlxg\nS8L1wfwRuYVNtL1pxk6N41Lp2QKBgQDD3MHXLcDkfqCW1LfAus7CkUhzPQfwcmeL\ng43fl5YKmhd1hlyeTRhjeIgg0UenO6gVHOeJqtNGmW8v/7VIMcfmNcOh6YCQRxhl\n/VXDUyLhYZSPxQwvLu5lsnHSy1jUqu3wx85Dk8qV64eR5gapkbDUJIFqIrHgMviJ\nCnTNdZbJLQKBgAJKgH0+o4VXkmgEe6JU6NX0KB3Uh+RL2kezLIyqzm7PK7XYxPNX\nkWgP5Jm1C94DvHZ2xQv5vJzzaz8ZhjPBh0i3AhhMbEEOULt+OJbqdizKqG8Pws4S\nOCKPavQEAhgAuoJbkJRxVBh/Fi1QCeKVSVJuHKlPCwC7Iram+BJzzl5ZAoGAM4Xn\nGAvZKkKFTCg5DmIV8ej1/hqX9BCkXHcG40KlHbTbZvcpdhshx0j1xmxHRR7UYHly\nDyz41yGVtjK2JX+y7kRGallakJmjOXEjFnbQPinFQuy6/86AuA/xEVqcy5ULcsOc\n5voB2N5Uk3THW+QPeD8CLEFkOW4vIx21DDdaqyECgYAB1TcsRktzmBON20CEmmXe\nvkIBkvq9lDGzsHMCtK6+toJJpOqZqki6WI+UJ6jC+SIayWL80zTIh75Iz4PjxRCD\nzIGoooHbvZyq7l2cqx2r3pjrhUTLTP7QSIA4ZXNCajr8zMF3S6Nl24esZlKB66cO\nYre5tdNHK7X55ke+xPpcgg==\n-----END PRIVATE KEY-----\n'
7-
GOOGLE_SHEETS_PRIVATE_KEY_ID=c81269c436e916ddc2c54c929a2cb223cee245e1
8-
GOOGLE_SHEETS_CLIENT_EMAIL=googlesheetscreds@trim-technique-365200.iam.gserviceaccount.com
9-
GOOGLE_SHEETS_CLIENT_ID=111899972459627584773
10-
GOOGLE_SHEETS_CLIENT_X509_CERT_URL=https://www.googleapis.com/robot/v1/metadata/x509/googlesheetscreds%40trim-technique-365200.iam.gserviceaccount.com

hwproj.front/src/components/Solutions/ExportToYandex.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const ExportToYandex: FC<ExportToYandexProps> = (props: ExportToYandexProps) =>
4343

4444
const setUserYandexToken = async (userConfirmationCode: string, userId: string) : Promise<string> => {
4545
const fetchBody = `grant_type=authorization_code&code=${userConfirmationCode}` +
46-
`&client_id=${process.env.REACT_APP_YANDEX_CLIENT_ID}&client_secret=${process.env.REACT_APP_YANDEX_CLIENT_SECRET}`;
46+
`&client_id=${import.meta.env.VITE_YANDEX_CLIENT_ID}&client_secret=${import.meta.env.VITE_YANDEX_CLIENT_SECRET}`;
4747

4848
const response = await fetch(`https://oauth.yandex.ru/token`, {
4949
method: "post",
@@ -88,7 +88,7 @@ const ExportToYandex: FC<ExportToYandexProps> = (props: ExportToYandexProps) =>
8888
{
8989
method: "get",
9090
headers: {
91-
'Authorization': `${process.env.REACT_APP_YANDEX_AUTHORIZATION_TOKEN}`,
91+
'Authorization': `${import.meta.env.VITE_YANDEX_AUTHORIZATION_TOKEN}`,
9292
}})
9393
.then( async (response) => {
9494
if (response.status >= 200 && response.status < 300) {
@@ -116,7 +116,7 @@ const ExportToYandex: FC<ExportToYandexProps> = (props: ExportToYandexProps) =>
116116
})
117117
}
118118

119-
const yacRequestLink = `https://oauth.yandex.ru/authorize?response_type=code&client_id=${process.env.REACT_APP_YANDEX_CLIENT_ID}`
119+
const yacRequestLink = `https://oauth.yandex.ru/authorize?response_type=code&client_id=${import.meta.env.VITE_YANDEX_CLIENT_ID}`
120120

121121
const buttonSx = {
122122
...(loadingStatus === LoadingStatus.Success && {
@@ -161,7 +161,7 @@ const ExportToYandex: FC<ExportToYandexProps> = (props: ExportToYandexProps) =>
161161
<Grid item>
162162
<Alert severity="success" variant={"standard"}>
163163
Авторизация успешно пройдена. Файл будет загружен на диск по адресу
164-
"Приложения/{process.env.REACT_APP_YANDEX_APPLICATION_NAME}/{fileName}.xlsx"
164+
"Приложения/{import.meta.env.VITE_YANDEX_APPLICATION_NAME}/{fileName}.xlsx"
165165
</Alert>
166166
</Grid>
167167
<Grid container item spacing={1} alignItems={"center"}>

0 commit comments

Comments
 (0)