Skip to content

Commit

Permalink
Revert "Enable SCSS on storybook (#1)" (#2)
Browse files Browse the repository at this point in the history
This reverts commit 5cfaa85.
  • Loading branch information
jwoo0122 authored Jan 30, 2021
1 parent 5cfaa85 commit 7e78de0
Show file tree
Hide file tree
Showing 14 changed files with 30 additions and 223 deletions.
14 changes: 1 addition & 13 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const sveltePreprocess = require('svelte-preprocess')
const path = require('path');
const path = require('path')

module.exports = {
"stories": [
Expand All @@ -11,20 +10,9 @@ module.exports = {
"@storybook/addon-essentials"
],
webpackFinal: async config => {
const svelteLoader = config.module.rules.find(
(r) => r.loader && r.loader.includes("svelte-loader")
);
svelteLoader.options = {
...svelteLoader.options,
preprocess: sveltePreprocess({ scss: true }),
};

config.resolve.alias = {
...config.resolve.alias,
"Components": path.resolve(__dirname, "../src/components"),
"Constants": path.resolve(__dirname, "../src/constants"),
"Models": path.resolve(__dirname, "../src/models"),
"Styles": path.resolve(__dirname, "../src/models"),
}

return config;
Expand Down
3 changes: 2 additions & 1 deletion .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

export const parameters = {
actions: { argTypesRegex: "^on[A-Z].*" },
}
}
3 changes: 0 additions & 3 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ const production = !process.env.ROLLUP_WATCH;
const aliases = alias({
entries: [
{ find: 'Components', replacement: 'src/components' },
{ find: 'Constants', replacement: 'src/constants' },
{ find: 'Styles', replacement: 'src/styles' },
{ find: 'Models', replacement: 'src/models' },
]
})

Expand Down
6 changes: 4 additions & 2 deletions src/App.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<script lang='ts'>
import MessageField from 'Components/MessageField.svelte'
import Cell from 'Components/Cell.svelte'
import Input from 'Components/Input.svelte'
</script>

<MessageField />
<Cell message="hello"/>
<Input initialString="hi"/>
99 changes: 13 additions & 86 deletions src/components/Cell.svelte
Original file line number Diff line number Diff line change
@@ -1,94 +1,21 @@
<script lang="ts">
import Message from 'Models/Message'
export let message: Message = new Message()
export let prevMessage: Message = new Message()
export let nextMessage: Message = new Message()
$: byMe = message.isMine()
$: isContinuous = prevMessage.author === message.author
$: willContinuous = nextMessage.author === message.author
$: paragraphs = message.content.split('\n')
export let message = ''
</script>

<div
class="wrapper"
class:byMe
>
<div
class="cell"
class:byMe
class:isContinuous
class:willContinuous
>
{#each paragraphs as paragraph}
<p>
{#if paragraph === ''}
<br />
{:else}
{ paragraph }
{/if}
</p>
{/each}
</div>
<div class="cell">
<p>
{ message }
</p>
</div>

<style type="text/scss">
$small-radius: 6px;
.wrapper {
display: flex;
align-items: center;
width: 100%;
&.byMe {
justify-content: flex-end;
}
&:not(:last-child) {
margin-bottom: 3px;
}
.cell {
width: fit-content;
max-width: 200px;
min-height: 25px;
font-size: 16px;
background-color: #f2f2f2; // TODO: Support Theming
color: black; // TODO: Support Theming
border-radius: 25px;
padding: 8px;
box-sizing: border-box;
word-wrap: break-word;
&.byMe {
background-color: #3cba4f; // TODO: Support Theming
color: white; // TODO: Support Theming
&.isContinuous {
border-top-right-radius: $small-radius;
}
&.willContinuous,
&:not(.isContinuous):not(.willContinuous) {
border-bottom-right-radius: $small-radius;
}
}
p {
margin: 0;
}
&:not(.byMe) {
&.isContinuous {
border-top-left-radius: $small-radius;
}
&.willContinuous,
&:not(.isContinuous):not(.willContinuous) {
border-bottom-left-radius: $small-radius;
}
}
}
.cell {
max-width: 100px;
min-height: 50px;
font-size: 16px;
background-color: grey;
border-radius: 25px;
padding: 10px;
box-sizing: border-box;
}
</style>
7 changes: 7 additions & 0 deletions src/components/Input.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<script>
export let initialString = ''
let inputValue = initialString
</script>

<input bind:value={inputValue} />
1 change: 0 additions & 1 deletion src/components/MessageField.svelte

This file was deleted.

24 changes: 0 additions & 24 deletions src/components/Stream.svelte

This file was deleted.

1 change: 0 additions & 1 deletion src/constants/Contexts.ts

This file was deleted.

25 changes: 0 additions & 25 deletions src/models/Message.ts

This file was deleted.

6 changes: 1 addition & 5 deletions src/stories/Cell.stories.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
/* Internal */
import Cell from 'Components/Cell.svelte'
import Message from 'Models/Message'

export default {
title: 'Cell',
component: Cell,
parameters: {
layout: 'centered',
},
}

const Template = (props) => ({
Expand All @@ -17,5 +13,5 @@ const Template = (props) => ({

export const Primary = Template.bind({})
Primary.args = {
message: new Message({ content: 'hello', author: 'me' }),
message: 'hello',
}
16 changes: 0 additions & 16 deletions src/stories/MessageField.stories.ts

This file was deleted.

42 changes: 0 additions & 42 deletions src/stories/Stream.stories.ts

This file was deleted.

6 changes: 2 additions & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"extends": "@tsconfig/svelte/tsconfig.json",
"compilerOptions": {
"importsNotUsedAsValues": "preserve"
},

"include": ["src/**/*"],
"exclude": ["node_modules/*", "__sapper__/*", "public/*"]
}
}

0 comments on commit 7e78de0

Please sign in to comment.