modified: .gitignore
new file: spa/vue/.gitignore new file: spa/vue/Makefile new file: spa/vue/README.md new file: spa/vue/advices.txt new file: spa/vue/index.html new file: spa/vue/jsconfig.json new file: spa/vue/package-lock.json new file: spa/vue/package.json new file: spa/vue/servers/authserver.js new file: spa/vue/servers/feedbackserver.js new file: spa/vue/servers/techsupportserver.js new file: spa/vue/src/App.vue new file: spa/vue/src/assets/colors.css new file: spa/vue/src/assets/fonts.css new file: spa/vue/src/assets/fonts/Open_Sans/OFL.txt new file: spa/vue/src/assets/fonts/Open_Sans/OpenSans-Italic-VariableFont_wdth,wght.ttf new file: spa/vue/src/assets/fonts/Open_Sans/OpenSans-Italic.woff new file: spa/vue/src/assets/fonts/Open_Sans/OpenSans-Italic.woff2 new file: spa/vue/src/assets/fonts/Open_Sans/OpenSans-Regular.woff new file: spa/vue/src/assets/fonts/Open_Sans/OpenSans-Regular.woff2 new file: spa/vue/src/assets/fonts/Open_Sans/OpenSans-VariableFont_wdth,wght.ttf new file: spa/vue/src/assets/fonts/Open_Sans/README.txt new file: spa/vue/src/assets/fonts/Open_Sans/hinted-OpenSans-Italic.eot new file: spa/vue/src/assets/fonts/Open_Sans/hinted-OpenSans-Italic.svg new file: spa/vue/src/assets/fonts/Open_Sans/hinted-OpenSans-Italic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/hinted-OpenSans-Regular.eot new file: spa/vue/src/assets/fonts/Open_Sans/hinted-OpenSans-Regular.svg new file: spa/vue/src/assets/fonts/Open_Sans/hinted-OpenSans-Regular.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans-Bold.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans-BoldItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans-ExtraBold.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans-ExtraBoldItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans-Italic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans-Light.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans-LightItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans-Medium.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans-MediumItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans-Regular.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans-SemiBold.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans-SemiBoldItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-Bold.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-BoldItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-ExtraBold.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-ExtraBoldItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-Italic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-Light.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-LightItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-Medium.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-MediumItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-Regular.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-SemiBold.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-SemiBoldItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-Bold.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-BoldItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-ExtraBold.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-ExtraBoldItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-Italic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-Light.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-LightItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-Medium.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-MediumItalic.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-Regular.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-SemiBold.ttf new file: spa/vue/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-SemiBoldItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/OFL.txt new file: spa/vue/src/assets/fonts/Roboto/README.txt new file: spa/vue/src/assets/fonts/Roboto/Roboto-Italic-VariableFont_wdth,wght.ttf new file: spa/vue/src/assets/fonts/Roboto/Roboto-Italic.woff new file: spa/vue/src/assets/fonts/Roboto/Roboto-Italic.woff2 new file: spa/vue/src/assets/fonts/Roboto/Roboto-Regular.woff new file: spa/vue/src/assets/fonts/Roboto/Roboto-Regular.woff2 new file: spa/vue/src/assets/fonts/Roboto/Roboto-VariableFont_wdth,wght.ttf new file: spa/vue/src/assets/fonts/Roboto/hinted-Roboto-Italic.eot new file: spa/vue/src/assets/fonts/Roboto/hinted-Roboto-Italic.svg new file: spa/vue/src/assets/fonts/Roboto/hinted-Roboto-Italic.ttf new file: spa/vue/src/assets/fonts/Roboto/hinted-Roboto-Regular.eot new file: spa/vue/src/assets/fonts/Roboto/hinted-Roboto-Regular.svg new file: spa/vue/src/assets/fonts/Roboto/hinted-Roboto-Regular.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-Black.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-BlackItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-Bold.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-BoldItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-ExtraBold.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-ExtraBoldItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-ExtraLight.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-ExtraLightItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-Italic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-Light.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-LightItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-Medium.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-MediumItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-Regular.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-SemiBold.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-SemiBoldItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-Thin.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto-ThinItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-Black.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-BlackItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-Bold.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-BoldItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-ExtraBold.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-ExtraBoldItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-ExtraLight.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-ExtraLightItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-Italic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-Light.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-LightItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-Medium.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-MediumItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-Regular.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-SemiBold.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-SemiBoldItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-Thin.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_Condensed-ThinItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-Black.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-BlackItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-Bold.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-BoldItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-ExtraBold.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-ExtraBoldItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-ExtraLight.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-ExtraLightItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-Italic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-Light.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-LightItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-Medium.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-MediumItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-Regular.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-SemiBold.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-SemiBoldItalic.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-Thin.ttf new file: spa/vue/src/assets/fonts/Roboto/static/Roboto_SemiCondensed-ThinItalic.ttf new file: spa/vue/src/assets/linksStyle.css new file: spa/vue/src/assets/main.css new file: spa/vue/src/auth/axios.js new file: spa/vue/src/auth/services/auth.service.js new file: spa/vue/src/auth/services/authService.js new file: spa/vue/src/auth/stores/auth.store.js new file: spa/vue/src/auth/stores/store.js new file: spa/vue/src/auth/vueauth/auth.js new file: spa/vue/src/auth/watch.js new file: spa/vue/src/components/about/about.vue new file: spa/vue/src/components/about/commits.vue new file: spa/vue/src/components/about/developers.vue new file: spa/vue/src/components/about/filosofy.vue new file: spa/vue/src/components/feetback/feetback.vue new file: spa/vue/src/components/footerB/footerB.vue new file: spa/vue/src/components/header/darkThemeToggle.vue new file: spa/vue/src/components/header/fullHeader.vue new file: spa/vue/src/components/header/headerMemu.vue new file: spa/vue/src/components/header/logo-rl-about.vue new file: spa/vue/src/components/header/toggleMenu.vue new file: spa/vue/src/components/images/icons/arrow_back_24dp_E8EAED_FILL0_wght400_GRAD0_opsz24.svg new file: spa/vue/src/components/images/icons/arrow_forward_24dp_E8EAED_FILL0_wght400_GRAD0_opsz24.svg new file: spa/vue/src/components/images/icons/close_24dp_E8EAED_FILL0_wght400_GRAD0_opsz24.svg new file: spa/vue/src/components/images/icons/home_24dp_E8EAED_FILL0_wght400_GRAD0_opsz24.svg new file: spa/vue/src/components/images/icons/menu_24dp_E8EAED_FILL0_wght400_GRAD0_opsz24.svg new file: spa/vue/src/components/images/logo150x150.png new file: spa/vue/src/components/images/photo_2025-01-25_05-57-24.jpg new file: spa/vue/src/components/images/restObject.jpg new file: spa/vue/src/components/inout/inout.vue new file: spa/vue/src/components/inout/registration.vue new file: spa/vue/src/components/profile/profile.vue new file: spa/vue/src/components/profile/profileEdit.vue new file: spa/vue/src/components/restObject/restObject.vue new file: spa/vue/src/components/restObject/restObjectEdit.vue new file: spa/vue/src/components/restObject/restOjbectAdd.vue new file: spa/vue/src/components/saerch_results/results.vue new file: spa/vue/src/components/searchLine/searchLine.vue new file: spa/vue/src/components/settings.vue new file: spa/vue/src/components/support.vue new file: spa/vue/src/locales/bak.json new file: spa/vue/src/locales/en.json new file: spa/vue/src/locales/i18n.js new file: spa/vue/src/locales/langToggle.vue new file: spa/vue/src/locales/languages.json new file: spa/vue/src/locales/ru.json new file: spa/vue/src/locales/tat.json new file: spa/vue/src/main.js new file: spa/vue/src/router/index.js new file: spa/vue/src/views/AboutView.vue new file: spa/vue/src/views/FeetbackView.vue new file: spa/vue/src/views/FilosofyView.vue new file: spa/vue/src/views/HomeView.vue new file: spa/vue/src/views/LogInView.vue new file: spa/vue/src/views/ProfileView.vue new file: spa/vue/src/views/RegistrationView.vue new file: spa/vue/src/views/RestObjectView.vue new file: spa/vue/src/views/ResultsView.vue new file: spa/vue/src/views/SettingsView.vue new file: spa/vue/src/views/SupportView.vue new file: spa/vue/tailwind.config.js new file: spa/vue/vite.config.js add hole project on vue3 for a time
This commit is contained in:
@@ -31,3 +31,4 @@ coverage
|
||||
*.sw?
|
||||
|
||||
*.tsbuildinfo
|
||||
*.node_modules
|
||||
@@ -0,0 +1,32 @@
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
lerna-debug.log*
|
||||
|
||||
node_modules
|
||||
.DS_Store
|
||||
dist-ssr
|
||||
coverage
|
||||
*.local
|
||||
|
||||
/cypress/videos/
|
||||
/cypress/screenshots/
|
||||
|
||||
# Editor directories and files
|
||||
.vscode/*
|
||||
!.vscode/extensions.json
|
||||
.idea
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
|
||||
*.tsbuildinfo
|
||||
|
||||
.idea
|
||||
.node_modules
|
||||
@@ -0,0 +1,13 @@
|
||||
build:
|
||||
npm run build
|
||||
|
||||
run:
|
||||
npm run dev
|
||||
|
||||
deploy:
|
||||
npm run build
|
||||
git add .
|
||||
git commit -m 'build deploy'
|
||||
git push
|
||||
|
||||
.DEFAULT_GOAL := run
|
||||
@@ -0,0 +1,24 @@
|
||||
### Есть задания для фрилансеров. Каждое задание 1000 рублей.
|
||||
|
||||
1. Задача настроить авторизацию через coocky no javaScript.
|
||||
2. Хранение состояния через vuex.
|
||||
3. Создать Makefile для работы со сборкой деплоем.
|
||||
|
||||
|
||||
## Project Setup
|
||||
|
||||
```sh
|
||||
npm install
|
||||
```
|
||||
|
||||
### Compile and Hot-Reload for Development
|
||||
|
||||
```sh
|
||||
npm run dev
|
||||
```
|
||||
|
||||
### Compile and Minify for Production
|
||||
|
||||
```sh
|
||||
npm run build
|
||||
```
|
||||
@@ -0,0 +1,30 @@
|
||||
Выбор шрифтов и размеров для мобильных устройств и десктопа зависит от множества факторов, таких как целевая аудитория, дизайн сайта/приложения и цели использования. Тем не менее, есть несколько общих рекомендаций, которые помогут обеспечить хорошую читаемость текста на разных устройствах.
|
||||
|
||||
### Шрифты
|
||||
|
||||
#### Для мобильных устройств:
|
||||
- **Roboto**: Один из самых популярных шрифтов для Android. Он имеет четкий и чистый вид, хорошо подходит для чтения на небольших экранах.
|
||||
- **San Francisco**: Стандартный шрифт для iOS. Хорошо сбалансирован и удобен для чтения.
|
||||
- **Open Sans**: Универсальный шрифт, который отлично смотрится на любых устройствах благодаря своей нейтральной стилистике.
|
||||
|
||||
#### Для десктопных устройств:
|
||||
- **Georgia**: Классический шрифт с засечками, который идеально подходит для длинных текстов. Обеспечивает комфортное чтение даже на больших экранах.
|
||||
- **Lato**: Современный шрифт без засечек, легкий и элегантный. Подходит для заголовков и основного текста.
|
||||
- **Merriweather**: Отличный выбор для длинных статей и блогов. Имеет хорошие пропорции и контрастность.
|
||||
|
||||
### Размеры шрифта
|
||||
|
||||
#### Мобильные устройства:
|
||||
- **Основной текст**: 16px–18px. Это оптимальный размер для комфортного чтения на маленьких экранах.
|
||||
- **Заголовки**: 20px–24px для h2, 18px–22px для h3, 16px–20px для h4.
|
||||
|
||||
#### Десктопные устройства:
|
||||
- **Основной текст**: 18px–20px. Такой размер обеспечивает удобство чтения на больших экранах.
|
||||
- **Заголовки**: 28px–32px для h2, 24px–28px для h3, 20px–24px для h4.
|
||||
|
||||
### Дополнительные советы:
|
||||
- Используйте **относительные единицы измерения** (em, rem) вместо абсолютных (px), чтобы шрифт масштабировался вместе с изменением размера экрана.
|
||||
- Следите за **межстрочным интервалом** (line-height). Оптимальное значение — около 1.5–1.6 для основного текста.
|
||||
- Убедитесь, что у вас достаточно **контраста между текстом и фоном**. Черный текст на белом фоне — классический пример хорошего сочетания.
|
||||
|
||||
Эти рекомендации помогут создать удобный интерфейс как для мобильных пользователей, так и для тех, кто работает за компьютером.
|
||||
@@ -0,0 +1,14 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<link rel="icon" href="/src/components/images/logo150x150.png">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<link rel="stylesheet" href="/src/assets/main.css">
|
||||
<title>YalArba</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
<script type="module" src="/src/main.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"paths": {
|
||||
"@/*": ["./src/*"]
|
||||
},
|
||||
},
|
||||
"exclude": ["node_modules", "dist"],
|
||||
}
|
||||
Generated
+4037
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,29 @@
|
||||
{
|
||||
"name": "spa",
|
||||
"version": "0.0.1",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": "^1.7.9",
|
||||
"body-parser": "^1.20.3",
|
||||
"cors": "^2.8.5",
|
||||
"express": "^4.21.2",
|
||||
"jwt-decode": "^4.0.0",
|
||||
"pg": "^8.13.1",
|
||||
"pinia": "^2.3.1",
|
||||
"vue": "^3.5.13",
|
||||
"vue-i18n": "^11.1.0",
|
||||
"vue-material-design-icons": "^5.3.1",
|
||||
"vue-router": "^4.5.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vitejs/plugin-vue": "^5.2.1",
|
||||
"vite": "^6.0.5",
|
||||
"vite-plugin-vue-devtools": "^7.6.8"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,106 @@
|
||||
const express = require('express');
|
||||
const { Pool } = require('pg');
|
||||
const bcrypt = require('bcryptjs');
|
||||
const jwt = require('jsonwebtoken');
|
||||
const bodyParser = require('body-parser');
|
||||
const cors = require('cors');
|
||||
|
||||
const app = express();
|
||||
const PORT = 6000;
|
||||
const SECRET_KEY = '89044513447896254393432085332044367'; // Замените на свой секретный ключ
|
||||
|
||||
// Middleware
|
||||
app.use(bodyParser.json());
|
||||
app.use(cors());
|
||||
|
||||
// Подключение к PostgreSQL
|
||||
const pool = new Pool({
|
||||
user: 'postgres',
|
||||
host: 'localhost',
|
||||
database: 'postgres',
|
||||
password: 'postgres',
|
||||
port: 5432,
|
||||
});
|
||||
|
||||
|
||||
// Регистрация
|
||||
app.post('/register', async (req, res) => {
|
||||
try {
|
||||
const { username, email, password } = req.body;
|
||||
|
||||
// Проверка, существует ли пользователь с таким email
|
||||
const userExists = await pool.query('SELECT * FROM users WHERE email = $1', [email]);
|
||||
if (userExists.rows.length > 0) {
|
||||
return res.status(400).json({ message: 'User with this email already exists' });
|
||||
}
|
||||
|
||||
// Хеширование пароля
|
||||
const hashedPassword = await bcrypt.hash(password, 10);
|
||||
|
||||
// Создание нового пользователя
|
||||
const newUser = await pool.query(
|
||||
'INSERT INTO users (username, email, password) VALUES ($1, $2, $3) RETURNING *',
|
||||
[username, email, hashedPassword]
|
||||
);
|
||||
|
||||
res.status(201).json({ message: 'User registered successfully', email: newUser.rows[0].email });
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).json({ message: 'Something went wrong' });
|
||||
}
|
||||
});
|
||||
|
||||
// Авторизация
|
||||
app.post('/login', async (req, res) => {
|
||||
try {
|
||||
const { email, password } = req.body;
|
||||
|
||||
// Поиск пользователя по email
|
||||
const user = await pool.query('SELECT * FROM users WHERE email = $1', [email]);
|
||||
if (user.rows.length === 0) {
|
||||
return res.status(400).json({ message: 'User not found' });
|
||||
}
|
||||
|
||||
// Проверка пароля
|
||||
const isPasswordValid = await bcrypt.compare(password, user.rows[0].password);
|
||||
if (!isPasswordValid) {
|
||||
return res.status(400).json({ message: 'Invalid credentials' });
|
||||
}
|
||||
|
||||
// Создание JWT токена
|
||||
const token = jwt.sign({ userId: user.rows[0].id }, SECRET_KEY, { expiresIn: '1h' });
|
||||
|
||||
res.status(200).json({ token });
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).json({ message: 'Something went wrong' });
|
||||
}
|
||||
});
|
||||
|
||||
// Эндпоинт для проверки токенов
|
||||
app.get('/check', async (req, res) => {
|
||||
try {
|
||||
// Извлекаем токен из заголовка Authorization
|
||||
const authorizationHeader = req.headers.authorization;
|
||||
if (!authorizationHeader) {
|
||||
return res.status(401).send({ message: 'No token provided' });
|
||||
}
|
||||
|
||||
// Разделяем строку на части: Bearer и сам токен
|
||||
const token = authorizationHeader.split(' ')[1];
|
||||
|
||||
// Проверяем токен
|
||||
const decodedToken = jwt.verify(token, SECRET_KEY);
|
||||
|
||||
// Если всё хорошо, отправляем положительный ответ
|
||||
res.send({ message: 'Token is valid', userId: decodedToken.userId });
|
||||
} catch (err) {
|
||||
// Если произошла ошибка, возвращаем сообщение об ошибке
|
||||
res.status(401).send({ message: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// Запуск сервера
|
||||
app.listen(PORT, () => {
|
||||
console.log(`Server is running on http://localhost:${PORT}`);
|
||||
})
|
||||
@@ -0,0 +1,45 @@
|
||||
const express = require('express');
|
||||
const bodyParser = require('body-parser');
|
||||
const { Pool } = require('pg');
|
||||
const cors = require('cors');
|
||||
|
||||
const app = express();
|
||||
const port = 3000;
|
||||
|
||||
app.use(cors());
|
||||
|
||||
app.use(bodyParser.json());
|
||||
|
||||
const pool = new Pool({
|
||||
user: 'postgres',
|
||||
host: 'localhost',
|
||||
database: 'postgres',
|
||||
password: 'postgres',
|
||||
port: 5432,
|
||||
});
|
||||
|
||||
app.get('/reviews', async(req, res) => {
|
||||
try {
|
||||
const result = await pool.query('SELECT * FROM reviews;');
|
||||
res.json(result.rows);
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
res.status(500).send("Server error");
|
||||
}
|
||||
});
|
||||
|
||||
app.post('/reviews', async(req, res) => {
|
||||
const { text } = req.body;
|
||||
try {
|
||||
const result = await pool.query('INSERT INTO reviews (text) VALUES ($1) RETURNING *', [text]);
|
||||
res.status(201).json(result.rows[0]);
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
res.status(500).send("Server error");
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
app.listen(port, '0.0.0.0', () => {
|
||||
console.log("Server is running on port ${port}");
|
||||
});
|
||||
@@ -0,0 +1,44 @@
|
||||
const express = require('express');
|
||||
const bodyParser = require('body-parser');
|
||||
const { Pool } = require('pg');
|
||||
const cors = require('cors');
|
||||
|
||||
const app = express();
|
||||
const port = 4000;
|
||||
|
||||
app.use(cors());
|
||||
|
||||
app.use(bodyParser.json());
|
||||
|
||||
const pool = new Pool({
|
||||
user: 'postgres',
|
||||
host: 'localhost',
|
||||
database: 'postgres',
|
||||
password: 'postgres',
|
||||
port: 5432,
|
||||
});
|
||||
|
||||
app.post('/support', async (req, res) => {
|
||||
const { email, text } = req.body;
|
||||
try {
|
||||
const result = await pool.query('INSERT INTO posts (email, text) VALUES ($1, $2) RETURNING *', [email, text]);
|
||||
res.status(201).json(result.rows[0]);
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
res.status(500).send("Server error");
|
||||
}
|
||||
});
|
||||
|
||||
app.get('/support', async (req, res) => {
|
||||
try {
|
||||
const result = await pool.query('SELECT * FROM posts;');
|
||||
res.json(result.rows);
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
res.status(500).send("Server error");
|
||||
}
|
||||
});
|
||||
|
||||
app.listen(port, '0.0.0.0', () => {
|
||||
console.log("Server is running on port ${port}");
|
||||
});
|
||||
@@ -0,0 +1,12 @@
|
||||
<script setup>
|
||||
import { RouterLink, RouterView } from 'vue-router'
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="main">
|
||||
<RouterView />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style>
|
||||
</style>
|
||||
@@ -0,0 +1,23 @@
|
||||
/* Светлая тема (по умолчанию) */
|
||||
:root {
|
||||
--background-color: #ffffff;
|
||||
--text-color: #1c1d1d;
|
||||
--light-dark-background-color: #ffffff;
|
||||
--light-dark-text-color: #273f2c;
|
||||
--disabled-backgroud-color: rgba(23, 62, 31, 0.281);
|
||||
--button-text-color: #bac677;
|
||||
--disabled-dark-background-color: rgba(55, 64, 62, 0.2);
|
||||
--button-dark-background-color: #3cbf40;
|
||||
--light-dark-background-color: #8cd68f;
|
||||
}
|
||||
|
||||
/* Темная тема */
|
||||
[data-theme="dark"] {
|
||||
--background-color: #282828;
|
||||
--text-color: #3cb756;
|
||||
--light-dark-background-color: #4e5e49;
|
||||
--light-dark-text-color: #59f37b;
|
||||
--disabled-dark-background-color: rgba(159, 193, 185, 0.2);
|
||||
--button-dark-background-color: #395e3a;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
@font-face {
|
||||
font-family: 'OpenSansVariableFont';
|
||||
src: url('./fonts/Open_Sans/hinted-OpenSans-Regular.ttf') format('truetype-variations'),
|
||||
url('./fonts/Open_Sans/OpenSans-Regular.woff') format('woff'),
|
||||
url('./fonts/Open_Sans/OpenSans-Regular.woff2') format('woff2');
|
||||
font-weight: 100 900;
|
||||
font-stretch: 50% 200%;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'OpenSansItalicVariableFont';
|
||||
src: url('./fonts/Open_Sans/hinted-OpenSans-Italic.ttf') format('truetype-variations'),
|
||||
url('./fonts/Open_Sans/OpenSans-Italic.woff') format('woff'),
|
||||
url('./fonts/Open_Sans/OpenSans-Italic.woff2') format('woff2');
|
||||
font-style: italic;
|
||||
font-weight: 100 900;
|
||||
font-stretch: 50% 200%;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'RobotoVariableFont';
|
||||
src: url('./fonts/Roboto/hinted-Roboto-Regular.ttf') format('truetype-variations'),
|
||||
url('./fonts/Roboto/Roboto-Regular.woff') format('woff'),
|
||||
url('./fonts/Roboto/Roboto-Regular.woff2') format('woff2');
|
||||
font-weight: 100 900;
|
||||
font-stretch: 50% 200%;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'RobotoItalicVarFont';
|
||||
src: url('./fonts/Roboto/hinted-Roboto-Italic.ttf') format('truetype-variations'),
|
||||
url('./fonts/Roboto/Roboto-Italic.woff') format('woff'),
|
||||
url('./fonts/Roboto/Roboto-Italic.woff2') format('woff2');
|
||||
font-style: italic;
|
||||
font-weight: 100 900;
|
||||
font-stretch: 50% 200%;
|
||||
}
|
||||
|
||||
:root {
|
||||
--font-primary: 'OpenSansVariableFont', Arial, sans-serif;
|
||||
--font-secondary: 'RobotoItalicVarFont', Arial, sans-serif;
|
||||
|
||||
--weight-light: 300;
|
||||
--weight-normal: 400;
|
||||
--weight-bold: 700;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: var(--font-primary);
|
||||
font-weight: var(--weight-normal);
|
||||
}
|
||||
|
||||
h1, h2, h3 {
|
||||
font-family: var(--font-secondary);
|
||||
font-weight: var(--weight-light);
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
https://openfontlicense.org
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,100 @@
|
||||
Open Sans Variable Font
|
||||
=======================
|
||||
|
||||
This download contains Open Sans as both variable fonts and static fonts.
|
||||
|
||||
Open Sans is a variable font with these axes:
|
||||
wdth
|
||||
wght
|
||||
|
||||
This means all the styles are contained in these files:
|
||||
OpenSans-VariableFont_wdth,wght.ttf
|
||||
OpenSans-Italic-VariableFont_wdth,wght.ttf
|
||||
|
||||
If your app fully supports variable fonts, you can now pick intermediate styles
|
||||
that aren’t available as static fonts. Not all apps support variable fonts, and
|
||||
in those cases you can use the static font files for Open Sans:
|
||||
static/OpenSans_Condensed-Light.ttf
|
||||
static/OpenSans_Condensed-Regular.ttf
|
||||
static/OpenSans_Condensed-Medium.ttf
|
||||
static/OpenSans_Condensed-SemiBold.ttf
|
||||
static/OpenSans_Condensed-Bold.ttf
|
||||
static/OpenSans_Condensed-ExtraBold.ttf
|
||||
static/OpenSans_SemiCondensed-Light.ttf
|
||||
static/OpenSans_SemiCondensed-Regular.ttf
|
||||
static/OpenSans_SemiCondensed-Medium.ttf
|
||||
static/OpenSans_SemiCondensed-SemiBold.ttf
|
||||
static/OpenSans_SemiCondensed-Bold.ttf
|
||||
static/OpenSans_SemiCondensed-ExtraBold.ttf
|
||||
static/OpenSans-Light.ttf
|
||||
static/OpenSans-Regular.ttf
|
||||
static/OpenSans-Medium.ttf
|
||||
static/OpenSans-SemiBold.ttf
|
||||
static/OpenSans-Bold.ttf
|
||||
static/OpenSans-ExtraBold.ttf
|
||||
static/OpenSans_Condensed-LightItalic.ttf
|
||||
static/OpenSans_Condensed-Italic.ttf
|
||||
static/OpenSans_Condensed-MediumItalic.ttf
|
||||
static/OpenSans_Condensed-SemiBoldItalic.ttf
|
||||
static/OpenSans_Condensed-BoldItalic.ttf
|
||||
static/OpenSans_Condensed-ExtraBoldItalic.ttf
|
||||
static/OpenSans_SemiCondensed-LightItalic.ttf
|
||||
static/OpenSans_SemiCondensed-Italic.ttf
|
||||
static/OpenSans_SemiCondensed-MediumItalic.ttf
|
||||
static/OpenSans_SemiCondensed-SemiBoldItalic.ttf
|
||||
static/OpenSans_SemiCondensed-BoldItalic.ttf
|
||||
static/OpenSans_SemiCondensed-ExtraBoldItalic.ttf
|
||||
static/OpenSans-LightItalic.ttf
|
||||
static/OpenSans-Italic.ttf
|
||||
static/OpenSans-MediumItalic.ttf
|
||||
static/OpenSans-SemiBoldItalic.ttf
|
||||
static/OpenSans-BoldItalic.ttf
|
||||
static/OpenSans-ExtraBoldItalic.ttf
|
||||
|
||||
Get started
|
||||
-----------
|
||||
|
||||
1. Install the font files you want to use
|
||||
|
||||
2. Use your app's font picker to view the font family and all the
|
||||
available styles
|
||||
|
||||
Learn more about variable fonts
|
||||
-------------------------------
|
||||
|
||||
https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
|
||||
https://variablefonts.typenetwork.com
|
||||
https://medium.com/variable-fonts
|
||||
|
||||
In desktop apps
|
||||
|
||||
https://theblog.adobe.com/can-variable-fonts-illustrator-cc
|
||||
https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
|
||||
|
||||
Online
|
||||
|
||||
https://developers.google.com/fonts/docs/getting_started
|
||||
https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
|
||||
https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
|
||||
|
||||
Installing fonts
|
||||
|
||||
MacOS: https://support.apple.com/en-us/HT201749
|
||||
Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
|
||||
Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
|
||||
|
||||
Android Apps
|
||||
|
||||
https://developers.google.com/fonts/docs/android
|
||||
https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
|
||||
|
||||
License
|
||||
-------
|
||||
Please read the full license text (OFL.txt) to understand the permissions,
|
||||
restrictions and requirements for usage, redistribution, and modification.
|
||||
|
||||
You can use them in your products & projects – print or digital,
|
||||
commercial or otherwise.
|
||||
|
||||
This isn't legal advice, please consider consulting a lawyer and see the full
|
||||
license for all details.
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 460 KiB |
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 406 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,93 @@
|
||||
Copyright 2011 The Roboto Project Authors (https://github.com/googlefonts/roboto-classic)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
https://openfontlicense.org
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
@@ -0,0 +1,118 @@
|
||||
Roboto Variable Font
|
||||
====================
|
||||
|
||||
This download contains Roboto as both variable fonts and static fonts.
|
||||
|
||||
Roboto is a variable font with these axes:
|
||||
wdth
|
||||
wght
|
||||
|
||||
This means all the styles are contained in these files:
|
||||
Roboto-VariableFont_wdth,wght.ttf
|
||||
Roboto-Italic-VariableFont_wdth,wght.ttf
|
||||
|
||||
If your app fully supports variable fonts, you can now pick intermediate styles
|
||||
that aren’t available as static fonts. Not all apps support variable fonts, and
|
||||
in those cases you can use the static font files for Roboto:
|
||||
static/Roboto_Condensed-Thin.ttf
|
||||
static/Roboto_Condensed-ExtraLight.ttf
|
||||
static/Roboto_Condensed-Light.ttf
|
||||
static/Roboto_Condensed-Regular.ttf
|
||||
static/Roboto_Condensed-Medium.ttf
|
||||
static/Roboto_Condensed-SemiBold.ttf
|
||||
static/Roboto_Condensed-Bold.ttf
|
||||
static/Roboto_Condensed-ExtraBold.ttf
|
||||
static/Roboto_Condensed-Black.ttf
|
||||
static/Roboto_SemiCondensed-Thin.ttf
|
||||
static/Roboto_SemiCondensed-ExtraLight.ttf
|
||||
static/Roboto_SemiCondensed-Light.ttf
|
||||
static/Roboto_SemiCondensed-Regular.ttf
|
||||
static/Roboto_SemiCondensed-Medium.ttf
|
||||
static/Roboto_SemiCondensed-SemiBold.ttf
|
||||
static/Roboto_SemiCondensed-Bold.ttf
|
||||
static/Roboto_SemiCondensed-ExtraBold.ttf
|
||||
static/Roboto_SemiCondensed-Black.ttf
|
||||
static/Roboto-Thin.ttf
|
||||
static/Roboto-ExtraLight.ttf
|
||||
static/Roboto-Light.ttf
|
||||
static/Roboto-Regular.ttf
|
||||
static/Roboto-Medium.ttf
|
||||
static/Roboto-SemiBold.ttf
|
||||
static/Roboto-Bold.ttf
|
||||
static/Roboto-ExtraBold.ttf
|
||||
static/Roboto-Black.ttf
|
||||
static/Roboto_Condensed-ThinItalic.ttf
|
||||
static/Roboto_Condensed-ExtraLightItalic.ttf
|
||||
static/Roboto_Condensed-LightItalic.ttf
|
||||
static/Roboto_Condensed-Italic.ttf
|
||||
static/Roboto_Condensed-MediumItalic.ttf
|
||||
static/Roboto_Condensed-SemiBoldItalic.ttf
|
||||
static/Roboto_Condensed-BoldItalic.ttf
|
||||
static/Roboto_Condensed-ExtraBoldItalic.ttf
|
||||
static/Roboto_Condensed-BlackItalic.ttf
|
||||
static/Roboto_SemiCondensed-ThinItalic.ttf
|
||||
static/Roboto_SemiCondensed-ExtraLightItalic.ttf
|
||||
static/Roboto_SemiCondensed-LightItalic.ttf
|
||||
static/Roboto_SemiCondensed-Italic.ttf
|
||||
static/Roboto_SemiCondensed-MediumItalic.ttf
|
||||
static/Roboto_SemiCondensed-SemiBoldItalic.ttf
|
||||
static/Roboto_SemiCondensed-BoldItalic.ttf
|
||||
static/Roboto_SemiCondensed-ExtraBoldItalic.ttf
|
||||
static/Roboto_SemiCondensed-BlackItalic.ttf
|
||||
static/Roboto-ThinItalic.ttf
|
||||
static/Roboto-ExtraLightItalic.ttf
|
||||
static/Roboto-LightItalic.ttf
|
||||
static/Roboto-Italic.ttf
|
||||
static/Roboto-MediumItalic.ttf
|
||||
static/Roboto-SemiBoldItalic.ttf
|
||||
static/Roboto-BoldItalic.ttf
|
||||
static/Roboto-ExtraBoldItalic.ttf
|
||||
static/Roboto-BlackItalic.ttf
|
||||
|
||||
Get started
|
||||
-----------
|
||||
|
||||
1. Install the font files you want to use
|
||||
|
||||
2. Use your app's font picker to view the font family and all the
|
||||
available styles
|
||||
|
||||
Learn more about variable fonts
|
||||
-------------------------------
|
||||
|
||||
https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
|
||||
https://variablefonts.typenetwork.com
|
||||
https://medium.com/variable-fonts
|
||||
|
||||
In desktop apps
|
||||
|
||||
https://theblog.adobe.com/can-variable-fonts-illustrator-cc
|
||||
https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
|
||||
|
||||
Online
|
||||
|
||||
https://developers.google.com/fonts/docs/getting_started
|
||||
https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
|
||||
https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
|
||||
|
||||
Installing fonts
|
||||
|
||||
MacOS: https://support.apple.com/en-us/HT201749
|
||||
Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
|
||||
Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
|
||||
|
||||
Android Apps
|
||||
|
||||
https://developers.google.com/fonts/docs/android
|
||||
https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
|
||||
|
||||
License
|
||||
-------
|
||||
Please read the full license text (OFL.txt) to understand the permissions,
|
||||
restrictions and requirements for usage, redistribution, and modification.
|
||||
|
||||
You can use them in your products & projects – print or digital,
|
||||
commercial or otherwise.
|
||||
|
||||
This isn't legal advice, please consider consulting a lawyer and see the full
|
||||
license for all details.
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 657 KiB |
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 636 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user