redrockjs/ocenka-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dev #1

Merged
redrockjs merged 66 commits from dev into main 2025-12-11 08:37:11 +00:00
Conversation 0 Commits 66 Files Changed 879 +155 -108
3 changed files with 155 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 18ebfa734a - Show all commits

81
.idea/workspace.xml generated
View File

@@ -5,33 +5,9 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="2a96f817-9dc2-4f3c-893a-c4974c750774" name="Changes" comment=""> <list default="true" id="2a96f817-9dc2-4f3c-893a-c4974c750774" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/src/views/home/about/index.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/about/styles.module.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/about/ui.tsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/call-us/index.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/call-us/styles.module.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/call-us/ui.tsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/experience/index.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/experience/styles.module.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/experience/ui.tsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/main/index.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/main/styles.module.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/main/ui.tsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/partners/index.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/partners/styles.module.scss" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/views/home/partners/ui.tsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/core/styles/variables.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/core/styles/variables.scss" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/widgets/footer/styles.module.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/widgets/footer/styles.module.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/entities/base-menu/ui.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/entities/base-menu/ui.tsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/shared/ui/partners-slider/styles.module.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/shared/ui/partners-slider/styles.module.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/views/home/styles.module.scss" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/views/home/ui.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/home/ui.tsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/widgets/footer/ui.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/widgets/footer/ui.tsx" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/widgets/footer/ui.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/widgets/footer/ui.tsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/widgets/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/widgets/index.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/widgets/service-grid/data.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/home/services/data.tsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/widgets/service-grid/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/home/services/index.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/widgets/service-grid/styles.module.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/home/services/styles.module.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/widgets/service-grid/ui.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/home/services/ui.tsx" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -39,7 +15,7 @@
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="DarkyenusTimeTracker"> <component name="DarkyenusTimeTracker">
<option name="totalTimeSeconds" value="180029" /> <option name="totalTimeSeconds" value="181981" />
<option name="gitIntegration" value="true" /> <option name="gitIntegration" value="true" />
<option name="naggedAbout" value="1" /> <option name="naggedAbout" value="1" />
</component> </component>
@@ -67,32 +43,32 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"ModuleVcsDetector.initialDetectionPerformed": "true", &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true", &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
"RunOnceActivity.git.unshallow": "true", &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
"com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true", &quot;com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1&quot;: &quot;true&quot;,
"git-widget-placeholder": "dev", &quot;git-widget-placeholder&quot;: &quot;dev&quot;,
"ignore.virus.scanning.warn.message": "true", &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
"js.debugger.nextJs.config.created.client": "true", &quot;js.debugger.nextJs.config.created.client&quot;: &quot;true&quot;,
"js.debugger.nextJs.config.created.server": "true", &quot;js.debugger.nextJs.config.created.server&quot;: &quot;true&quot;,
"junie.onboarding.icon.badge.shown": "true", &quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
"list.type.of.created.stylesheet": "SCSS", &quot;list.type.of.created.stylesheet&quot;: &quot;SCSS&quot;,
"node.js.detected.package.eslint": "true", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.detected.package.tslint": "true", &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"node.js.selected.package.tslint": "(autodetect)", &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
"nodejs_package_manager_path": "npm", &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
"npm.Next.js: server-side.executor": "Run", &quot;npm.Next.js: server-side.executor&quot;: &quot;Run&quot;,
"prettierjs.PrettierConfiguration.Package": "C:\\dev-personal\\ocenka-web\\node_modules\\prettier", &quot;prettierjs.PrettierConfiguration.Package&quot;: &quot;C:\\dev-personal\\ocenka-web\\node_modules\\prettier&quot;,
"settings.editor.selected.configurable": "terminal", &quot;settings.editor.selected.configurable&quot;: &quot;terminal&quot;,
"to.speed.mode.migration.done": "true", &quot;to.speed.mode.migration.done&quot;: &quot;true&quot;,
"ts.external.directory.path": "C:\\dev-personal\\ocenka-web\\node_modules\\typescript\\lib", &quot;ts.external.directory.path&quot;: &quot;C:\\dev-personal\\ocenka-web\\node_modules\\typescript\\lib&quot;,
"vue.rearranger.settings.migration": "true" &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
} }
}]]></component> }</component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="C:\dev-personal\ocenka-web\src\views\home" /> <recent name="C:\dev-personal\ocenka-web\src\views\home" />
@@ -131,7 +107,8 @@
<workItem from="1764586916122" duration="32000" /> <workItem from="1764586916122" duration="32000" />
<workItem from="1764590282382" duration="1201000" /> <workItem from="1764590282382" duration="1201000" />
<workItem from="1764591867512" duration="4332000" /> <workItem from="1764591867512" duration="4332000" />
<workItem from="1764657017067" duration="21236000" /> <workItem from="1764657017067" duration="21490000" />
<workItem from="1764741053553" duration="1873000" />
</task> </task>
<servers /> <servers />
</component> </component>

84
src/widgets/footer/styles.module.scss
View File

@@ -15,12 +15,12 @@
.Grid { .Grid {
margin: 0 auto; margin: 0 auto;
max-width: 1540px; max-width: rem(1540px);
padding: 20px 10px 20px; padding: rem(20px) rem(10px) rem(20px);
display: grid; display: grid;
grid-template-columns: auto; grid-template-columns: auto;
grid-auto-columns: 1fr; grid-auto-columns: 1fr;
gap: 40px 20px; gap: rem(40px) rem(20px);
grid-auto-flow: row; grid-auto-flow: row;
grid-template-areas: grid-template-areas:
"about" "about"
@@ -32,32 +32,32 @@
grid-template-areas: grid-template-areas:
"about about" "about about"
"contacts social"; "contacts social";
padding: 40px 20px 0; padding: rem(40px) rem(20px) 0;
gap: 20px 2px; gap: rem(20px) 0;
} }
@include iflaptop { @include iflaptop {
grid-template-columns: 1fr 1fr 1fr 1fr; grid-template-columns: 1fr 1fr 1fr 1fr;
grid-template-areas: grid-template-areas:
"about linksa linksb linksc" "about linksa linksb linksc"
"contacts contacts social social"; "contacts contacts social social";
padding: 40px 28px 0; padding: rem(40px) rem(28px) 0;
gap: 0px 0px; gap: 0 0;
} }
@include ifdesktop { @include ifdesktop {
padding: 40px 40px 0; padding: rem(40px) rem(40px) 0;
} }
.About { .About {
grid-area: about; grid-area: about;
.Image { .Image {
margin-bottom: 20px; margin-bottom: rem(20px);
} }
.Description { .Description {
font-family: $font-roboto; font-family: $font-roboto;
font-weight: $font-regular; font-weight: 400;
font-size: 20px; font-size: rem(20px);
line-height: 160%; line-height: 160%;
color: $color-white; color: $color-white;
} }
@@ -65,7 +65,7 @@
.LinksA { .LinksA {
grid-area: linksa; grid-area: linksa;
padding: 10px; padding: rem(10px);
display: none; display: none;
@include iftablet { @include iftablet {
} }
@@ -90,7 +90,7 @@
.LinksB { .LinksB {
grid-area: linksb; grid-area: linksb;
padding: 10px; padding: rem(10px);
display: none; display: none;
@include iflaptop { @include iflaptop {
@@ -112,7 +112,7 @@
.LinksC { .LinksC {
grid-area: linksc; grid-area: linksc;
padding: 10px; padding: rem(10px);
display: none; display: none;
@include iflaptop { @include iflaptop {
@@ -134,6 +134,9 @@
.Contacts { .Contacts {
grid-area: contacts; grid-area: contacts;
border-top: 1px solid #4da49a;
margin-top: rem(20px);
padding-top: rem(20px);
.Title { .Title {
@extend %title; @extend %title;
@@ -143,7 +146,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
gap: 24px; gap: rem(24px);
@include iflaptop { @include iflaptop {
flex-direction: row; flex-direction: row;
@@ -154,7 +157,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
gap: 16px; gap: rem(16px);
@include iftablet { @include iftablet {
} }
@@ -167,9 +170,9 @@
.Icon { .Icon {
border-radius: 50%; border-radius: 50%;
width: 48px; width: rem(48px);
height: 48px; height: rem(48px);
padding: 8px; padding: rem(8px);
background: $color-white; background: $color-white;
} }
@@ -182,12 +185,15 @@
.Social { .Social {
grid-area: social; grid-area: social;
border-top: 1px solid #4da49a;
margin-top: rem(20px);
padding-top: rem(20px);
@include iflaptop { @include iflaptop {
padding-left: 100px; padding-left: rem(100px);
} }
@include ifdesktop { @include ifdesktop {
padding-left: 200px; padding-left: rem(200px);
} }
.Title { .Title {
@@ -198,7 +204,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
gap: 20px; gap: rem(20px);
} }
.Icon { .Icon {
@@ -209,27 +215,27 @@
.Bottom { .Bottom {
margin: 0 auto; margin: 0 auto;
max-width: 1540px; max-width: rem(1540px);
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
padding: 16px 10px; padding: rem(16px) rem(10px);
font-family: $font-roboto; font-family: $font-roboto;
font-weight: $font-regular; font-weight: 400;
font-size: 16px; font-size: rem(16px);
line-height: 100%; line-height: 100%;
color: $color-white; color: $color-white;
@include iftablet { @include iftablet {
padding: 16px 20px; padding: rem(16px) rem(20px);
} }
@include iflaptop { @include iflaptop {
padding: 16px 28px; padding: rem(16px) rem(28px);
} }
@include ifdesktop { @include ifdesktop {
padding: 16px 40px; padding: rem(16px) rem(40px);
} }
.List { .List {
@@ -259,7 +265,7 @@
& a { & a {
text-decoration: none; text-decoration: none;
color: $color-link-hover; color: $color-link-hover;
margin: 0 8px; margin: 0 rem(8px);
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
@@ -269,11 +275,11 @@
%title { %title {
font-family: $font-roboto; font-family: $font-roboto;
font-weight: $font-regular; font-weight: 400;
font-size: 20px; font-size: 20px;
line-height: 100%; line-height: 100%;
color: $color-white; color: $color-white;
margin-bottom: 20px; margin-bottom: rem(20px);
} }
%list { %list {
@@ -281,22 +287,24 @@
flex-direction: column; flex-direction: column;
gap: 10px; gap: 10px;
list-style: disc; list-style: disc;
margin-left: rem(40px);
} }
%list-item { %list-item {
font-family: $font-roboto; font-family: $font-roboto;
font-weight: $font-regular; font-weight: 300;
font-size: 16px; font-size: rem(16px);
line-height: 130%; line-height: 130%;
color: $color-white; color: $color-white;
margin-left: 20px; &:hover{
text-decoration: underline;
}
} }
%icon-desc { %icon-desc {
font-family: $font-roboto; font-family: $font-roboto;
font-weight: $font-regular; font-size: rem(18px);
font-size: 18px;
line-height: 100%; line-height: 100%;
color: $color-white; color: $color-white;
margin-bottom: 20px; margin-bottom: rem(20px);
} }

98
src/widgets/footer/ui.tsx
View File

@@ -22,38 +22,100 @@ function Footer() {
<div className={s.LinksA}> <div className={s.LinksA}>
<h3 className={s.Title}>Оценка имущества</h3> <h3 className={s.Title}>Оценка имущества</h3>
<ol className={s.List}> <ol className={s.List}>
<li className={s.ListItem}>Оценка жилой недвижимости</li>
<li className={s.ListItem}>Оценка коммерческой недвижимости</li>
<li className={s.ListItem}>Оценка ущерба недвижимости</li>
<li className={s.ListItem}>Оценка сооружений</li>
<li className={s.ListItem}>Оценка машин и оборудования</li>
<li className={s.ListItem}> <li className={s.ListItem}>
Оценка стоимости предприятия (бизнеса) <Link href={ROUTES.OCENKA_NEDVIGA}>
Оценка жилой недвижимости
</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.OCENKA_ZDANIE}>
Оценка коммерческой недвижимости
</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.OCENKA_USCHERB_NEDVIGI}>
Оценка ущерба недвижимости
</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.OCENKA_SOORUZHENIE}>Оценка сооружений</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.OCENKA_MASHINES}>
Оценка машин и оборудования
</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.OCENKA_BUSINESS}>
Оценка стоимости предприятия (бизнеса)
</Link>
</li> </li>
</ol> </ol>
</div> </div>
<div className={s.LinksB}> <div className={s.LinksB}>
<h3 className={s.Title}>Экспертиза</h3> <h3 className={s.Title}>Экспертиза</h3>
<ol className={s.List}> <ol className={s.List}>
<li className={s.ListItem}>Автотехническая экспертиза</li> <li className={s.ListItem}>
<li className={s.ListItem}>Товароведческая экспертиза</li> <Link href={ROUTES.EXPERTIZA_AUTOTECH}>
<li className={s.ListItem}>Трасологическая экспертиза</li> Автотехническая экспертиза
<li className={s.ListItem}>Кадастровая экспертиза</li> </Link>
<li className={s.ListItem}>Строительно-техническая экспертиза</li> </li>
<li className={s.ListItem}>Оценочная экспертиза</li> <li className={s.ListItem}>
<Link href={ROUTES.EXPERTIZA_TOVAR}>
Товароведческая экспертиза
</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.EXPERTIZA_TRASOLOGIA}>
Трасологическая экспертиза
</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.EXPERTIZA_KADASTR}>
Кадастровая экспертиза
</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.EXPERTIZA_STROIT}>
Строительно-техническая экспертиза
</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.EXPERTIZA_OCENKI}>Оценочная экспертиза</Link>
</li>
</ol> </ol>
</div> </div>
<div className={s.LinksC}> <div className={s.LinksC}>
<h3 className={s.Title}>Юриспруденция</h3> <h3 className={s.Title}>Юриспруденция</h3>
<ol className={s.List}> <ol className={s.List}>
<li className={s.ListItem}>Семейные и наследственные споры</li>
<li className={s.ListItem}>Земельные и имущественные споры</li>
<li className={s.ListItem}>Взыскание долгов с юридических лиц</li>
<li className={s.ListItem}>Страховые споры</li>
<li className={s.ListItem}> <li className={s.ListItem}>
Сопровождение сделок и составление договоров <Link href={ROUTES.JURIST_NASLEDSTVO}>
Семейные и наследственные споры
</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.JURIST_ZEMLYA_IMUSHESTVO}>
Земельные и имущественные споры
</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.JURIST_DOLGI}>
Взыскание долгов с юридических лиц
</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.JURIST_STRAHOVKA}>Страховые споры</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.JURIST_SDELKI_DOGOVORA}>
Сопровождение сделок и составление договоров
</Link>
</li>
<li className={s.ListItem}>
<Link href={ROUTES.JURIST_PREDSTAVITELSTVO}>
Представительство в суде
</Link>
</li> </li>
<li className={s.ListItem}>Представительство в суде</li>
</ol> </ol>
</div> </div>
<div className={s.Contacts}> <div className={s.Contacts}>